Regenerate wintsto. Add @echo off at top.

diff --git a/gpsbabel/mingw/mkwintesto.c b/gpsbabel/mingw/mkwintesto.c
index 8a003cf60d93b36844fbd73b82d8d4d7fb229c4c..cacd8518c841a18427ff9675a794cf85db4b51dd 100644 (file)
--- a/gpsbabel/mingw/mkwintesto.c
+++ b/gpsbabel/mingw/mkwintesto.c
@@ -115,6 +115,7 @@ int main(
                else {
 
                        // Output the .CMD preamble
+                       f_outputLine("@echo off", pfTestoOut);
                        f_outputLine("REM", pfTestoOut);
                        f_outputLine("REM Simple Windows NT/2000/XP .cmd version of GPSBabel testo script", pfTestoOut);
                        f_outputLine("REM", pfTestoOut);

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 8345c74223f087944f5e21715a39938513dda43d..2203136ba5f785d50378d10efe63287c102d37e4 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -1,3 +1,4 @@
+@echo off\r
 REM\r
 REM Simple Windows NT/2000/XP .cmd version of GPSBabel testo script\r
 REM\r
@@ -311,6 +312,15 @@ DEL %TMPDIR%\gpxroute.gpx %TMPDIR%\maggpx.rte
 %PNAME% -r -i gpx -f %TMPDIR%\gpxroute.gpx -o magellan -F %TMPDIR%\maggpx.rte\r
 CALL :COMPARE %TMPDIR%\maggpx.rte reference\route\magellan.rte\r
 \r
+REM\r
+REM GPX tracks -- since GPX contains a date stamp, tests will always\r
+REM fail, so we use magellan as an interim format...\r
+REM\r
+DEL %TMPDIR%\gpxtrack.gpx %TMPDIR%\maggpx.trk\r
+%PNAME% -t -i gpx -f reference\track\tracks.gpx -o gpx -F %TMPDIR%\gpxtrack.gpx\r
+%PNAME% -t -i magellan -f reference\track\meridian.trk -o gpx -F %TMPDIR%\maggpx.trk\r
+CALL :COMPARE %TMPDIR%\maggpx.trk %TMPDIR%\gpxtrack.gpx\r
+\r
 REM\r
 REM MAPSEND waypoint / route format\r
 REM\r
@@ -410,11 +420,22 @@ DEL %TMPDIR%\polygon.txt
 %PNAME% -i xmap -f reference\arcdist_input.txt -x polygon,file=reference\polygon_allencty.txt -o xmap -F %TMPDIR%\polygon.txt\r
 CALL :COMPARE %TMPDIR%\polygon.txt reference\polygon_output.txt\r
 \r
-\r
-\r
+REM\r
+REM Simplify filter\r
+REM\r
+DEL %TMPDIR%\simplify.txt\r
+%PNAME% -r -i gpx -f reference\route\route.gpx -x simplify,count=10 -o arc -F %TMPDIR%\simplify.txt\r
+CALL :COMPARE %TMPDIR%\simplify.txt reference\simplify_output.txt\r
 \r
 REM\r
-REM This is  nasty.   If we have a dictionary handy, treat it as a list of\r
-REM waypoints and reduce all the names to eight characters.   Fewer chars\r
-REM results in lost waypoints currently and that's a defect.\r
+REM Route reversal filter.   Do it twice and be sure we get what we\r
+REM started with.\r
 REM\r
+DEL %TMPDIR%\reverse1.arc %TMPDIR%\reverse2.arc %TMPDIR%\reference.arc\r
+%PNAME% -r -i gpx -f reference\route\route.gpx -o arc -F %TMPDIR%\reference.arc\r
+%PNAME% -r -i gpx -f reference\route\route.gpx -x reverse -o arc -F %TMPDIR%\reverse1.arc\r
+%PNAME% -r -i gpx -f reference\route\route.gpx -x reverse -x reverse -o arc -F %TMPDIR%\reverse2.arc\r
+REM Verify the first and last are the same\r
+CALL :COMPARE %TMPDIR%\reference.arc  %TMPDIR%\reverse2.arc\r
+REM Verify the first and second are different.\r
+\r